Skip to content

Fixes for MPI-ESM1-2-HR and MPI-ESM1-2-XR#356

Merged
mattiarighi merged 13 commits into
developmentfrom
development_PRIMAVERA_fixes
Nov 28, 2019
Merged

Fixes for MPI-ESM1-2-HR and MPI-ESM1-2-XR#356
mattiarighi merged 13 commits into
developmentfrom
development_PRIMAVERA_fixes

Conversation

@sloosvel

@sloosvel sloosvel commented Nov 4, 2019

Copy link
Copy Markdown
Contributor

Before you start, please read CONTRIBUTING.md.

Tasks

  • Create an issue to discuss what you are going to do, if you haven't done so already (and add the link at the bottom)
  • This pull request has a descriptive title that can be used in a changelog
  • Add unit tests
  • Public functions should have a numpy-style docstring so they appear properly in the API documentation. For all other functions a one line docstring is sufficient.
  • If writing a new/modified preprocessor function, please update the documentation
  • Circle/CI tests pass. Status can be seen below your pull request. If the tests are failing, click the link to find out why.
  • Codacy code quality checks pass. Status can be seen below your pull request. If there is an error, click the link to find out why. If you suspect Codacy may be wrong, please ask by commenting.
  • Please use yamllint to check that your YAML files do not contain mistakes
  • If you make backward incompatible changes to the recipe format, make a new pull request in the ESMValTool repository and add the link below

If you need help with any of the tasks above, please do not hesitate to ask by commenting in the issue or pull request.


Closes {#355}

@sloosvel sloosvel added the fix for dataset Related to dataset-specific fix files label Nov 4, 2019
@valeriupredoi

Copy link
Copy Markdown
Contributor

thanks a bunch @sloosvel 🍺 Note that MPI-ESM1-2-XR is not currently present in /cmor/tables/cmip6/Tables/CMIP6_CV.json so that either needs to be added there (via an update of the CMOR tables, not by hand by us) or we temporarily add it to config-developer.yml

@sloosvel

sloosvel commented Nov 4, 2019

Copy link
Copy Markdown
Contributor Author

I added the institute and activity manually in the recipes where I use the model, but sure I can add it to the config-developer if you prefer.

@valeriupredoi

Copy link
Copy Markdown
Contributor

well we need something that's foolproof, ie not something the user would add or forget to add to their recipes, ideally the CV should be updated centrally, but in the absence of that config-developer would do 🍺

@valeriupredoi

Copy link
Copy Markdown
Contributor

ooh can you also add 'CESM2-WACCM': ['NCAR'] since you're so nice to add the XR plese 🐈

@sloosvel

sloosvel commented Nov 4, 2019

Copy link
Copy Markdown
Contributor Author

Sure, even though in #107 (comment) @jvegasbsc was against doing that. But whatever you prefer.

Comment thread esmvalcore/config-developer.yml Outdated
input_file: '{short_name}_{mip}_{dataset}_{exp}_{ensemble}_{grid}*.nc'
output_file: '{project}_{dataset}_{mip}_{exp}_{ensemble}_{short_name}_{start_year}-{end_year}'
institutes:
'CESM2-WACCM': ['NCAR']

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should not be needed if we just update the cmor tables to the latest version. I made a pull request here: #363

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So this list will have to be updated every time the tables get updated?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the other institute can also be removed.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

careful what you merge first - if you merge this PR before #363 then it won't work proper 🍺

Comment thread esmvalcore/cmor/_fixes/cmip6/mpi_esm1_2_hr.py Outdated
Comment thread esmvalcore/cmor/_fixes/cmip6/mpi_esm1_2_hr.py
@mattiarighi mattiarighi merged commit 56513d4 into development Nov 28, 2019
@mattiarighi mattiarighi deleted the development_PRIMAVERA_fixes branch November 28, 2019 09:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

fix for dataset Related to dataset-specific fix files

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants